Skip to content

[WOOMOB-2574] Disable FedEx support locally#15587

Merged
irfano merged 2 commits intotrunkfrom
issue/WOOMOB-disable-fedex-support-locally
Mar 31, 2026
Merged

[WOOMOB-2574] Disable FedEx support locally#15587
irfano merged 2 commits intotrunkfrom
issue/WOOMOB-disable-fedex-support-locally

Conversation

@irfano
Copy link
Copy Markdown
Contributor

@irfano irfano commented Mar 30, 2026 •
edited
Loading

Description

Fixes WOOMOB-2574

Disables FedEx in the Android shipping labels flow behind a temporary feature flag.
This hides FedEx in both the package carrier tabs and the shipping rates flow while the mobile support remains turned off.

Slack discussion:

Test Steps

  1. Open an order that can be used to create a shipping label (The site should be connected to staging server).
  2. Start the shipping label flow.
  3. Go to the package selection screen.
  4. Open the Carrier tab.
  5. Confirm FedEx is not shown in the carrier list.
  6. Continue to the shipping rates step.
  7. Confirm FedEx rates are not shown.

Images/gif

Before After
Screenshot_20260330_232148 Screenshot_20260330_232009
  • I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

@irfano irfano added type: task An internally driven task. feature: shipping labels Related to creating, ordering, or printing shipping labels. status: feature-flagged Behind a feature flag. Milestone is not strongly held. labels Mar 30, 2026
@irfano irfano marked this pull request as ready for review March 30, 2026 20:22
@irfano irfano added this to the 24.5 milestone Mar 30, 2026
@wpmobilebot
Copy link
Copy Markdown
Collaborator

wpmobilebot commented Mar 30, 2026

App Icon📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

App NameWooCommerce Android
Platform📱 Mobile
FlavorJalapeno
Build TypeDebug
Build Number736
Version24.4-rc-1
Application IDcom.woocommerce.android.prealpha
Commit6844355
Installation URL2e4flhhpt3sl8
 Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Mar 30, 2026

Codecov Report

❌ Patch coverage is 92.30769% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 39.62%. Comparing base (3674aff) to head (6844355).

Files with missing lines Patch % Lines
...els/packages/datasource/ObserveShippingPackages.kt 83.33% 0 Missing and 1 partial ⚠️
Additional details and impacted files 
@@            Coverage Diff            @@
##              trunk   #15587   +/-   ##
=========================================
  Coverage     39.62%   39.62%           
- Complexity    11336    11338    +2     
=========================================
  Files          2260     2260           
  Lines        130597   130605    +8     
  Branches      18302    18304    +2     
=========================================
+ Hits          51753    51758    +5     
- Misses        73555    73557    +2     
- Partials       5289     5290    +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@irfano irfano changed the title [WOOMOB-2574] Disable FedEx support locally on Android [WOOMOB-2574] Disable FedEx support locally Mar 30, 2026
@AdamGrzybkowski AdamGrzybkowski self-assigned this Mar 31, 2026
AdamGrzybkowski
AdamGrzybkowski approved these changes Mar 31, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@AdamGrzybkowski AdamGrzybkowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! One question though - couldn't the backend simply filter out FedEx until its ready? 🤔

WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt
AGE_ELIGIBILITY_CHECKS("age_eligibility_checks", localValue = PackageUtils.isDebugBuild()),
WOO_SELF_DRIVEN_PUSH_NOTIFICATIONS_M1("woo_self_driven_push_notifications_m1", localValue = false),
WOO_SELF_DRIVEN_PUSH_NOTIFICATIONS_M2("woo_self_driven_push_notifications_m2", localValue = false),
WOO_SHIPPING_FEDEX("woo_shipping_fedex", localValue = false),
Copy link
Copy Markdown
Contributor

@AdamGrzybkowski AdamGrzybkowski Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ Any reasons for not taking advantage of the new unified feature flag handling and setting the local value to true while disabling the feature remotely? Is there any benefit of having it done in a way that requires an extra app update?

Copy link
Copy Markdown
Contributor Author

@irfano irfano Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We set localValue to false because the FedEx implementation is still missing on our side. Setting localValue to false means this version does not support FedEx.
We will set it to true after completing WOOMOB-2572.

@AdamGrzybkowski
Copy link
Copy Markdown
Contributor

AdamGrzybkowski commented Mar 31, 2026

@irfano Should this PR target 24.4?

@irfano
Copy link
Copy Markdown
Contributor Author

irfano commented Mar 31, 2026 •
edited
Loading

@irfano Should this PR target 24.4?

No, because this feature was added in #15533.

@irfano
Copy link
Copy Markdown
Contributor Author

irfano commented Mar 31, 2026

One question though - couldn't the backend simply filter out FedEx until its ready? 🤔

I’m not sure, actually. If we add this logic to the backend, it would always need to keep that logic to avoid sending FedEx to Android 24.5 and iOS 24.4. Also, I’m not sure whether the backend can filter based on app version. Disabling it on the client side seems like the better option to me.

@irfano irfano merged commit 563c92d into trunk Mar 31, 2026
30 checks passed
@irfano irfano deleted the issue/WOOMOB-disable-fedex-support-locally branch March 31, 2026 17:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AdamGrzybkowski AdamGrzybkowski AdamGrzybkowski approved these changes

@hichamboushaba hichamboushaba Awaiting requested review from hichamboushaba

@JorgeMucientes JorgeMucientes Awaiting requested review from JorgeMucientes

Assignees

@AdamGrzybkowski AdamGrzybkowski

Labels

feature: shipping labels Related to creating, ordering, or printing shipping labels. status: feature-flagged Behind a feature flag. Milestone is not strongly held. type: task An internally driven task.

Projects

None yet

Milestone

24.5

Development

Successfully merging this pull request may close these issues.

4 participants

@irfano @wpmobilebot @codecov-commenter @AdamGrzybkowski